From a3fd8815ef4c686ae44e9792933e4941896a6977 Mon Sep 17 00:00:00 2001 From: "Ian.Campbell@xensource.com" Date: Fri, 21 Apr 2006 18:06:06 +0100 Subject: [PATCH] Don't BUG_ON() if we cannot register an NMI callback since it is not a fatal problem. Signed-off-by: Ian Campbell --- .../include/asm-i386/mach-xen/setup_arch_post.h | 3 +-- .../include/asm-x86_64/mach-xen/setup_arch_post.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h index a349bb18a0..279bd5a348 100644 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h @@ -60,9 +60,8 @@ static void __init machine_specific_arch_setup(void) struct xennmi_callback cb; cb.handler_address = nmi_cb.address.eip; - ret = HYPERVISOR_nmi_op(XENNMI_register_callback, &cb); + HYPERVISOR_nmi_op(XENNMI_register_callback, &cb); } - BUG_ON(ret); if (HYPERVISOR_xen_version(XENVER_platform_parameters, &pp) == 0) diff --git a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h index aca5ba7e65..e21d4ee6f2 100644 --- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h +++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h @@ -52,8 +52,7 @@ static void __init machine_specific_arch_setup(void) struct xennmi_callback cb; cb.handler_address = nmi_cb.address; - ret = HYPERVISOR_nmi_op(XENNMI_register_callback, &cb); + HYPERVISOR_nmi_op(XENNMI_register_callback, &cb); } - BUG_ON(ret); #endif } -- 2.30.2